lisp/ChangeLog: Remove merge markers.
authorJuanma Barranquero <lekktu@gmail.com>
Wed, 18 Aug 2010 23:32:39 +0000 (01:32 +0200)
committerJuanma Barranquero <lekktu@gmail.com>
Wed, 18 Aug 2010 23:32:39 +0000 (01:32 +0200)
commit71eab1406625791cdc0f0be0f8741e1e26184f29
tree6294f4bfa5b6b5b4f7ff0d72671ab3f5412f19e5
parent7a542acd40a722a556dcadc039aa8e00645dfd00
lisp/ChangeLog: Remove merge markers.
lisp/ChangeLog